_STD -> _VSTD to avoid macro clash on windows git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@134190 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/strstream b/include/strstream index 6e60365..8f4ed0c 100644 --- a/include/strstream +++ b/include/strstream
@@ -207,8 +207,8 @@ #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY istrstream(istrstream&& __rhs) - : istream(_STD::move(__rhs)), - __sb_(_STD::move(__rhs.__sb_)) + : istream(_VSTD::move(__rhs)), + __sb_(_VSTD::move(__rhs.__sb_)) { istream::set_rdbuf(&__sb_); } @@ -216,8 +216,8 @@ _LIBCPP_INLINE_VISIBILITY istrstream& operator=(istrstream&& __rhs) { - istream::operator=(_STD::move(__rhs)); - __sb_ = _STD::move(__rhs.__sb_); + istream::operator=(_VSTD::move(__rhs)); + __sb_ = _VSTD::move(__rhs.__sb_); return *this; } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES @@ -256,8 +256,8 @@ #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY ostrstream(ostrstream&& __rhs) - : ostream(_STD::move(__rhs)), - __sb_(_STD::move(__rhs.__sb_)) + : ostream(_VSTD::move(__rhs)), + __sb_(_VSTD::move(__rhs.__sb_)) { ostream::set_rdbuf(&__sb_); } @@ -265,8 +265,8 @@ _LIBCPP_INLINE_VISIBILITY ostrstream& operator=(ostrstream&& __rhs) { - ostream::operator=(_STD::move(__rhs)); - __sb_ = _STD::move(__rhs.__sb_); + ostream::operator=(_VSTD::move(__rhs)); + __sb_ = _VSTD::move(__rhs.__sb_); return *this; } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES @@ -316,8 +316,8 @@ #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY strstream(strstream&& __rhs) - : iostream(_STD::move(__rhs)), - __sb_(_STD::move(__rhs.__sb_)) + : iostream(_VSTD::move(__rhs)), + __sb_(_VSTD::move(__rhs.__sb_)) { iostream::set_rdbuf(&__sb_); } @@ -325,8 +325,8 @@ _LIBCPP_INLINE_VISIBILITY strstream& operator=(strstream&& __rhs) { - iostream::operator=(_STD::move(__rhs)); - __sb_ = _STD::move(__rhs.__sb_); + iostream::operator=(_VSTD::move(__rhs)); + __sb_ = _VSTD::move(__rhs.__sb_); return *this; } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES 